don't try free gettext() values,

	fix a printing dialog crasher (bug 544390)

svn path=/trunk/; revision=20904

diff --git a/ChangeLog b/ChangeLog
index a3dd598ebca8a9313407488ac71e1ccca41d2a83..226cd18b89e37bc19838422a55acf654d4fb1fcc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-24  Sebastien Bacher  <seb128@ubuntu.com>
+
+       * modules/printbackends/cups/gtkprintbackendcups.c:
+       (cups_printer_get_options): don't try free gettext() values,
+       fix a printing dialog crasher (bug 544390)
+
 2008-07-24  Cody Russell  <bratsche@gnome.org>
 
        Bug 544510 – SetTimer callback signatures has the wrong type

diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
index dffb0b52ec94b55349f5630ee4e1933f174ad7c4..f493063b7d9715e3b95b668f465f3f1e1e55cc34 100644 (file)
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -2673,6 +2673,7 @@ cups_printer_get_options (GtkPrinter           *printer,
       char *cover_display_default[] = {N_("None"), N_("Classified"), N_("Confidential"), N_("Secret"), N_("Standard"), N_("Top Secret"), N_("Unclassified"),};
       char **cover = NULL;
       char **cover_display = NULL;
+      char **cover_display_translated = NULL;
       gint num_of_covers = 0;
       gpointer value;
       gint j;
@@ -2682,6 +2683,8 @@ cups_printer_get_options (GtkPrinter           *printer,
       cover[num_of_covers] = NULL;
       cover_display = g_new (char *, num_of_covers + 1);
       cover_display[num_of_covers] = NULL;
+      cover_display_translated = g_new (char *, num_of_covers + 1);
+      cover_display_translated[num_of_covers] = NULL;
 
       for (i = 0; i < num_of_covers; i++)
         {
@@ -2697,11 +2700,11 @@ cups_printer_get_options (GtkPrinter           *printer,
         }
 
       for (i = 0; i < num_of_covers; i++)
-        cover_display[i] = _(cover_display[i]);
+        cover_display_translated[i] = _(cover_display[i]);
   
       option = gtk_printer_option_new ("gtk-cover-before", "Before", GTK_PRINTER_OPTION_TYPE_PICKONE);
       gtk_printer_option_choices_from_array (option, num_of_covers,
-                                        cover, cover_display);
+                                        cover, cover_display_translated);
 
       if (backend->default_cover_before != NULL)
         gtk_printer_option_set (option, backend->default_cover_before);
@@ -2713,7 +2716,7 @@ cups_printer_get_options (GtkPrinter           *printer,
 
       option = gtk_printer_option_new ("gtk-cover-after", "After", GTK_PRINTER_OPTION_TYPE_PICKONE);
       gtk_printer_option_choices_from_array (option, num_of_covers,
-                                        cover, cover_display);
+                                        cover, cover_display_translated);
       if (backend->default_cover_after != NULL)
         gtk_printer_option_set (option, backend->default_cover_after);
       else
@@ -2724,6 +2727,7 @@ cups_printer_get_options (GtkPrinter           *printer,
 
       g_strfreev (cover);
       g_strfreev (cover_display);
+      g_free (cover_display_translated);
     }
 
   option = gtk_printer_option_new ("gtk-print-time", "Print at", GTK_PRINTER_OPTION_TYPE_PICKONE);